builder: Remove user_data argument from gtk_builder_connect_signals()

This is pretty unused and gets in the way of the next steps.

A potential side effect is that for templates the widget was passed as
the user data argument. If that turns out to be important, we have to
special case that situation.

diff --git a/demos/gtk-demo/builder.c b/demos/gtk-demo/builder.c
index cf293c53cdfd5cd8bef538548688a3f433355a71..9a982b3dd9a1c11856694f7000d0121106b77296 100644 (file)
--- a/demos/gtk-demo/builder.c
+++ b/demos/gtk-demo/builder.c
@@ -59,7 +59,7 @@ do_builder (GtkWidget *do_widget)
 
       builder = gtk_builder_new_from_resource ("/builder/demo.ui");
 
-      gtk_builder_connect_signals (builder, NULL);
+      gtk_builder_connect_signals (builder);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));

diff --git a/demos/gtk-demo/cursors.c b/demos/gtk-demo/cursors.c
index 275dab06d1f3e52264c91704d8b6517e0d444bea..e150d14b22a855b1e270163f98cb9d8278c60d9d 100644 (file)
--- a/demos/gtk-demo/cursors.c
+++ b/demos/gtk-demo/cursors.c
@@ -24,7 +24,7 @@ do_cursors (GtkWidget *do_widget)
       GtkBuilder *builder;
 
       builder = gtk_builder_new_from_resource ("/cursors/cursors.ui");
-      gtk_builder_connect_signals (builder, NULL);
+      gtk_builder_connect_signals (builder);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));

diff --git a/demos/gtk-demo/filtermodel.c b/demos/gtk-demo/filtermodel.c
index a7f3f55c0af492a77ebdd4ef9e941a74e5f218c0..a0e6660684451fc2aeab31c38ed3653ef8c9f71e 100644 (file)
--- a/demos/gtk-demo/filtermodel.c
+++ b/demos/gtk-demo/filtermodel.c
@@ -122,7 +122,7 @@ do_filtermodel (GtkWidget *do_widget)
       GtkBuilder *builder;
 
       builder = gtk_builder_new_from_resource ("/filtermodel/filtermodel.ui");
-      gtk_builder_connect_signals (builder, NULL);
+      gtk_builder_connect_signals (builder);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));

diff --git a/demos/gtk-demo/fishbowl.c b/demos/gtk-demo/fishbowl.c
index 45f63710b0ee5f8bb75b2200dccc0f897d3a361d..1c1a8691fe76c6d16ce31076317f433848ac3ccf 100644 (file)
--- a/demos/gtk-demo/fishbowl.c
+++ b/demos/gtk-demo/fishbowl.c
@@ -293,7 +293,7 @@ do_fishbowl (GtkWidget *do_widget)
                                         "prev_button_clicked_cb", G_CALLBACK (prev_button_clicked_cb),
                                         "changes_toggled_cb", G_CALLBACK (changes_toggled_cb),
                                         NULL);
-      gtk_builder_connect_signals (builder, NULL);
+      gtk_builder_connect_signals (builder);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);

diff --git a/demos/gtk-demo/font_features.c b/demos/gtk-demo/font_features.c
index 665e59864770cca6c57d88ba91ecbb6c3858e617..a7a1bf81d6ff54a6fc88a1635303aaa89fda60a1 100644 (file)
--- a/demos/gtk-demo/font_features.c
+++ b/demos/gtk-demo/font_features.c
@@ -1221,7 +1221,7 @@ do_font_features (GtkWidget *do_widget)
       gtk_builder_add_callback_symbol (builder, "reset", reset_features);
       gtk_builder_add_callback_symbol (builder, "stop_edit", G_CALLBACK (stop_edit));
       gtk_builder_add_callback_symbol (builder, "toggle_edit", G_CALLBACK (toggle_edit));
-      gtk_builder_connect_signals (builder, NULL);
+      gtk_builder_connect_signals (builder);
 
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
       feature_list = GTK_WIDGET (gtk_builder_get_object (builder, "feature_list"));

diff --git a/demos/gtk-demo/fontrendering.c b/demos/gtk-demo/fontrendering.c
index 2f3274f3eb35cae415ac8ba796262c48679ed85e..9cd18f041d177ce9d9b5d0acc92f881ccbe35b3d 100644 (file)
--- a/demos/gtk-demo/fontrendering.c
+++ b/demos/gtk-demo/fontrendering.c
@@ -248,7 +248,7 @@ do_fontrendering (GtkWidget *do_widget)
       GtkBuilder *builder;
 
       builder = gtk_builder_new_from_resource ("/fontrendering/fontrendering.ui");
-      gtk_builder_connect_signals (builder, NULL);
+      gtk_builder_connect_signals (builder);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));

diff --git a/demos/gtk-demo/iconscroll.c b/demos/gtk-demo/iconscroll.c
index 63a68bc62d57fb48efdca28abc0932528c7a7bb4..509aa4642b6028d6f3ede1b28214921d59d1ef0b 100644 (file)
--- a/demos/gtk-demo/iconscroll.c
+++ b/demos/gtk-demo/iconscroll.c
@@ -210,7 +210,7 @@ do_iconscroll (GtkWidget *do_widget)
                                         "next_clicked_cb", G_CALLBACK (next_clicked_cb),
                                         "prev_clicked_cb", G_CALLBACK (prev_clicked_cb),
                                         NULL);
-      gtk_builder_connect_signals (builder, NULL);
+      gtk_builder_connect_signals (builder);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);

diff --git a/demos/gtk-demo/modelbutton.c b/demos/gtk-demo/modelbutton.c
index 8adbe3762c36d1f9246bf1a42f0c3bee13890ea5..b454415762155cb5c50b84c5e1f0bf7c4a97d810 100644 (file)
--- a/demos/gtk-demo/modelbutton.c
+++ b/demos/gtk-demo/modelbutton.c
@@ -41,7 +41,7 @@ do_modelbutton (GtkWidget *do_widget)
 
       builder = gtk_builder_new_from_resource ("/modelbutton/modelbutton.ui");
       gtk_builder_add_callback_symbol (builder, "tool_clicked", G_CALLBACK (tool_clicked));
-      gtk_builder_connect_signals (builder, NULL);
+      gtk_builder_connect_signals (builder);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));

diff --git a/demos/gtk-demo/revealer.c b/demos/gtk-demo/revealer.c
index 6d4ee0c3c06a3bdcd5822410f73ddc48af698c8b..5b65f36b72e1c47b67e9c86a761998253b0b3693 100644 (file)
--- a/demos/gtk-demo/revealer.c
+++ b/demos/gtk-demo/revealer.c
@@ -69,7 +69,7 @@ do_revealer (GtkWidget *do_widget)
       GtkBuilder *builder;
 
       builder = gtk_builder_new_from_resource ("/revealer/revealer.ui");
-      gtk_builder_connect_signals (builder, NULL);
+      gtk_builder_connect_signals (builder);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));

diff --git a/demos/gtk-demo/scale.c b/demos/gtk-demo/scale.c
index 938eb1a9d1b9aea913e2cceef73ff7a7d333a122..2b44107a76e1cade3eef2e83c8c0818e4f08e2e1 100644 (file)
--- a/demos/gtk-demo/scale.c
+++ b/demos/gtk-demo/scale.c
@@ -18,7 +18,7 @@ do_scale (GtkWidget *do_widget)
       GtkBuilder *builder;
 
       builder = gtk_builder_new_from_resource ("/scale/scale.ui");
-      gtk_builder_connect_signals (builder, NULL);
+      gtk_builder_connect_signals (builder);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));

diff --git a/demos/gtk-demo/shortcuts.c b/demos/gtk-demo/shortcuts.c
index 884431e7748aa30d28a43d784ea5566b25becb91..124bb11585fe3d972debb0a7de2cb587ee4c765e 100644 (file)
--- a/demos/gtk-demo/shortcuts.c
+++ b/demos/gtk-demo/shortcuts.c
@@ -95,7 +95,7 @@ do_shortcuts (GtkWidget *do_widget)
                                         "boxes_shortcuts_wizard", G_CALLBACK (boxes_shortcuts_wizard),
                                         "boxes_shortcuts_display", G_CALLBACK (boxes_shortcuts_display),
                                         NULL);
-      gtk_builder_connect_signals (builder, NULL);
+      gtk_builder_connect_signals (builder);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));

diff --git a/demos/gtk-demo/spinbutton.c b/demos/gtk-demo/spinbutton.c
index d01d073d78f458ee5433aa22a5f84e9957e34206..e30456eb2135fd0c5a7b01b577a8d24d534c576b 100644 (file)
--- a/demos/gtk-demo/spinbutton.c
+++ b/demos/gtk-demo/spinbutton.c
@@ -199,7 +199,7 @@ do_spinbutton (GtkWidget *do_widget)
                                       "month_spin_input", G_CALLBACK (month_spin_input),
                                       "month_spin_output", G_CALLBACK (month_spin_output),
                                       NULL);
-    gtk_builder_connect_signals (builder, NULL);
+    gtk_builder_connect_signals (builder);
     window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
     gtk_window_set_display (GTK_WINDOW (window),
                             gtk_widget_get_display (do_widget));

diff --git a/demos/gtk-demo/stack.c b/demos/gtk-demo/stack.c
index d86e485e7dd7f295ebd3e5eb4592908716a057e8..9d3b5eee61e0ed797a5db30a8d077e8696d91b5e 100644 (file)
--- a/demos/gtk-demo/stack.c
+++ b/demos/gtk-demo/stack.c
@@ -18,7 +18,7 @@ do_stack (GtkWidget *do_widget)
       GtkBuilder *builder;
 
       builder = gtk_builder_new_from_resource ("/stack/stack.ui");
-      gtk_builder_connect_signals (builder, NULL);
+      gtk_builder_connect_signals (builder);
       window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));

diff --git a/demos/widget-factory/widget-factory.c b/demos/widget-factory/widget-factory.c
index 4af47abf0d655d2fac80894f3f15597e69986ab7..65b46b0d501f3ca05d6041f78e22d54ca9af53bb 100644 (file)
--- a/demos/widget-factory/widget-factory.c
+++ b/demos/widget-factory/widget-factory.c
@@ -1729,7 +1729,7 @@ activate (GApplication *app)
   gtk_builder_add_callback_symbol (builder, "reset_icon_size", (GCallback)reset_icon_size);
   gtk_builder_add_callback_symbol (builder, "osd_frame_pressed", (GCallback)osd_frame_pressed);
 
-  gtk_builder_connect_signals (builder, NULL);
+  gtk_builder_connect_signals (builder);
 
   window = (GtkWindow *)gtk_builder_get_object (builder, "window");
   gtk_application_add_window (GTK_APPLICATION (app), window);

diff --git a/gtk/gtkbuilder.c b/gtk/gtkbuilder.c
index b2d136931aba66c240711e28a65640286a420d9e..5538ecfe8c6304e76babb515f45ba4abf86d8fe3 100644 (file)
--- a/gtk/gtkbuilder.c
+++ b/gtk/gtkbuilder.c
@@ -1689,7 +1689,6 @@ gtk_builder_connect_signals_default (GtkBuilder    *builder,
 /**
  * gtk_builder_connect_signals:
  * @builder: a #GtkBuilder
- * @user_data: user data to pass back with all signals
  *
  * This method is a simpler variation of gtk_builder_connect_signals_full().
  * It uses symbols explicitly added to @builder with prior calls to
@@ -1714,14 +1713,13 @@ gtk_builder_connect_signals_default (GtkBuilder    *builder,
  * gmodule-export-2.0.
  **/
 void
-gtk_builder_connect_signals (GtkBuilder *builder,
-                             gpointer    user_data)
+gtk_builder_connect_signals (GtkBuilder *builder)
 {
   g_return_if_fail (GTK_IS_BUILDER (builder));
 
   gtk_builder_connect_signals_full (builder,
                                     gtk_builder_connect_signals_default,
-                                    user_data);
+                                    NULL);
 }
 
 /**

diff --git a/gtk/gtkbuilder.h b/gtk/gtkbuilder.h
index a3b2e7ad0ebd770f8d5924ed7d8437f65e00095b..f3353cedcfe209c7a719c2f6b06888b67e7d4c35 100644 (file)
--- a/gtk/gtkbuilder.h
+++ b/gtk/gtkbuilder.h
@@ -150,8 +150,7 @@ void         gtk_builder_expose_object           (GtkBuilder    *builder,
                                                   const gchar   *name,
                                                   GObject       *object);
 GDK_AVAILABLE_IN_ALL
-void         gtk_builder_connect_signals         (GtkBuilder    *builder,
-                                                 gpointer       user_data);
+void         gtk_builder_connect_signals         (GtkBuilder    *builder);
 GDK_AVAILABLE_IN_ALL
 void         gtk_builder_connect_signals_full    (GtkBuilder    *builder,
                                                   GtkBuilderConnectFunc func,

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 0b8e4a07e27b0f71faff53d882e90956eccef1c7..2cd54e13f234fed019e90508b9b0aa0cf4333724 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -12212,7 +12212,7 @@ gtk_widget_init_template (GtkWidget *widget)
   if (template->connect_func)
     gtk_builder_connect_signals_full (builder, template->connect_func, template->connect_data);
   else
-    gtk_builder_connect_signals (builder, object);
+    gtk_builder_connect_signals (builder);
 
   g_object_unref (builder);
 }

diff --git a/tests/teststackedheaders.c b/tests/teststackedheaders.c
index c342d685ca0eab431fccc7eb637032903c89bcdc..60a03b6a681bdcd02efca1f9f8b840d7f8c7e20a 100644 (file)
--- a/tests/teststackedheaders.c
+++ b/tests/teststackedheaders.c
@@ -34,7 +34,7 @@ main (int argc, char *argv[])
   gtk_builder_add_callback_symbol (builder, "back_to_main", G_CALLBACK (back_to_main));
   gtk_builder_add_callback_symbol (builder, "go_to_secondary", G_CALLBACK (go_to_secondary));
   gtk_builder_add_from_file (builder, "teststackedheaders.ui", NULL);
-  gtk_builder_connect_signals (builder, NULL);
+  gtk_builder_connect_signals (builder);
 
   win = (GtkWidget *)gtk_builder_get_object (builder, "window");
   header_stack = (GtkWidget *)gtk_builder_get_object (builder, "header_stack");

diff --git a/tests/visuals/visuals.c b/tests/visuals/visuals.c
index 7faed005361b3549727c1d183bb9ec3189fc8cc3..f9f1d8f8a7e275f4cf149fa30a3b29ab15b56c95 100644 (file)
--- a/tests/visuals/visuals.c
+++ b/tests/visuals/visuals.c
@@ -68,7 +68,7 @@ main (int argc, char *argv[])
 
   builder = gtk_builder_new ();
   gtk_builder_add_from_file (builder, filename, NULL);
-  gtk_builder_connect_signals (builder, NULL);
+  gtk_builder_connect_signals (builder);
 
   window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
   g_object_unref (G_OBJECT (builder));

diff --git a/testsuite/gtk/builder.c b/testsuite/gtk/builder.c
index 89636bc3bbd4d29cfbb945f97c27737f84552621..a31dd910e604b8f79e1a7e4325545a99ca519eda 100644 (file)
--- a/testsuite/gtk/builder.c
+++ b/testsuite/gtk/builder.c
@@ -244,7 +244,7 @@ test_connect_signals (void)
     "</interface>";
 
   builder = builder_new_from_string (buffer, -1, NULL);
-  gtk_builder_connect_signals (builder, NULL);
+  gtk_builder_connect_signals (builder);
 
   window = gtk_builder_get_object (builder, "window1");
   gtk_window_set_title (GTK_WINDOW (window), "test");
@@ -258,7 +258,7 @@ test_connect_signals (void)
   g_object_unref (builder);
   
   builder = builder_new_from_string (buffer_order, -1, NULL);
-  gtk_builder_connect_signals (builder, NULL);
+  gtk_builder_connect_signals (builder);
   window = gtk_builder_get_object (builder, "window1");
   normal = 0;
   gtk_window_set_title (GTK_WINDOW (window), "test");
@@ -270,7 +270,7 @@ test_connect_signals (void)
                               strlen (buffer_extra), NULL);
   gtk_builder_add_from_string (builder, buffer_extra2,
                               strlen (buffer_extra2), NULL);
-  gtk_builder_connect_signals (builder, NULL);
+  gtk_builder_connect_signals (builder);
   window = gtk_builder_get_object (builder, "window2");
   gtk_window_set_title (GTK_WINDOW (window), "test");
   g_assert (normal == 30);
@@ -289,7 +289,7 @@ test_connect_signals (void)
   
   builder = builder_new_from_string (buffer_after_child, -1, NULL);
   window = gtk_builder_get_object (builder, "window1");
-  gtk_builder_connect_signals (builder, NULL);
+  gtk_builder_connect_signals (builder);
   gtk_window_set_title (GTK_WINDOW (window), "test");
 
   g_assert (normal == 1);
@@ -2601,7 +2601,7 @@ test_anaconda_signal (void)
     "</interface>";
 
   builder = builder_new_from_string (buffer, -1, NULL);
-  gtk_builder_connect_signals (builder, NULL);
+  gtk_builder_connect_signals (builder);
 
   g_object_unref (builder);
 }